diff --git a/src/app/core/services/api.service.ts b/src/app/core/services/api.service.ts
index 14f752fb..e9801514 100644
--- a/src/app/core/services/api.service.ts
+++ b/src/app/core/services/api.service.ts
@@ -124,7 +124,7 @@ export class ApiService {
console.log('this.baseHref', this.baseHref);
const headers = ApiService.makeHeaders(vote_stack);
console.log('headers', headers);
- const url = `${this.baseHref}/poll/${poll.custom_url}/answer`;
+ const url = `${this.baseHref}/vote/poll/${poll.custom_url}/answer`;
const axiosconf = {
url,
diff --git a/src/app/features/administration/form/base-config/base-config.component.html b/src/app/features/administration/form/base-config/base-config.component.html
index 89b0568b..322286f3 100644
--- a/src/app/features/administration/form/base-config/base-config.component.html
+++ b/src/app/features/administration/form/base-config/base-config.component.html
@@ -2,11 +2,14 @@
-
+
diff --git a/src/app/features/administration/form/base-config/base-config.component.scss b/src/app/features/administration/form/base-config/base-config.component.scss
index e69de29b..db71fe1e 100644
--- a/src/app/features/administration/form/base-config/base-config.component.scss
+++ b/src/app/features/administration/form/base-config/base-config.component.scss
@@ -0,0 +1,4 @@
+#title {
+ display: block;
+ width: 80%;
+}
diff --git a/src/app/features/administration/form/kind-select/kind-select.component.scss b/src/app/features/administration/form/kind-select/kind-select.component.scss
index e69de29b..db507a9d 100644
--- a/src/app/features/administration/form/kind-select/kind-select.component.scss
+++ b/src/app/features/administration/form/kind-select/kind-select.component.scss
@@ -0,0 +1,5 @@
+#kind {
+ width: 100%;
+ max-width: 100%;
+ display: block;
+}
diff --git a/src/environments/endpoints.ts b/src/environments/endpoints.ts
new file mode 100644
index 00000000..bf388a1f
--- /dev/null
+++ b/src/environments/endpoints.ts
@@ -0,0 +1,48 @@
+const backendApiUrlsInDev = {
+ local: 'http://tktest.lan/api/v1',
+ remote: 'http://tktest.lan/api/v1',
+ // remote: 'https://framadate-api.cipherbliss.com/api/v1',
+};
+const apiV1 = {
+ baseHref: 'http://tktest.lan/api/v1',
+ // baseHref: 'https://framadate-api.cipherbliss.com/api/v1',
+ api_new_poll: '/poll/',
+ api_get_poll: '/poll/{id}',
+ api_new_vote_stack: '/poll/{id}/answer',
+ 'api_test-mail-poll': '/api/v1/poll/mail/test-mail-poll/{emailChoice}',
+ 'app.swagger': '/api/doc.json',
+};
+
+export const endpoints = {
+ versionToUse: 'apiV1',
+ version: {
+ apiV1,
+ },
+ baseHref: backendApiUrlsInDev.local,
+ endpoints: {
+ polls: {
+ name: '/poll',
+ choices: {
+ name: '/choices',
+ },
+ comments: {
+ name: '/comments',
+ },
+ slugs: {
+ name: '/slugs',
+ },
+ answers: {
+ name: '/answers',
+ },
+ },
+ users: {
+ name: '/users',
+ polls: {
+ name: '/polls',
+ sendEmail: {
+ name: '/send-email',
+ },
+ },
+ },
+ },
+};
diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts
index 8de6f602..55345545 100644
--- a/src/environments/environment.prod.ts
+++ b/src/environments/environment.prod.ts
@@ -1,3 +1,6 @@
+import { endpoints } from './endpoints';
+import { poll_conf } from './poll_conf';
+
const backendApiUrlsInDev = {
local: '/api/v1',
remote: 'https://framadate-api.cipherbliss.com/api/v1',
@@ -15,56 +18,15 @@ export const environment = {
production: true,
display_routes: true,
showDemoWarning: true,
- autofill: false,
+ autofill: true,
autoSendNewPoll: false,
interval_days_default: 7,
appTitle: 'FramaDate Funky',
- appVersion: '2.1.0',
+ appVersion: '0.6.0',
appLogo: 'assets/img/logo.png',
- api: {
- versionToUse: 'apiV1',
- version: {
- apiV1,
- },
- baseHref: backendApiUrlsInDev.remote,
- endpoints: {
- polls: {
- name: '/poll',
- choices: {
- name: '/choices',
- },
- comments: {
- name: '/comments',
- },
- slugs: {
- name: '/slugs',
- },
- answers: {
- name: '/answers',
- },
- },
- users: {
- name: '/users',
- polls: {
- name: '/polls',
- sendEmail: {
- name: '/send-email',
- },
- },
- },
- },
- },
- poll: {
- defaultConfig: {
- maxCountOfAnswers: 150,
- expiresDaysDelay: 60,
- expiracyAfterLastModificationInDays: 180,
- whoCanChangeAnswers: 'everybody',
- visibility: 'link_only',
- voteChoices: 'only_yes',
- },
- },
+ api: endpoints,
+ poll: poll_conf,
localStorage: {
- key: 'FramaSondage',
+ key: 'FramaDateFunky',
},
};
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index 05b0fc11..38f9f847 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -2,77 +2,24 @@
// `ng build --prod` replaces `environment.ts` with `environment.prod.ts`.
// The list of file replacements can be found in `angular.json`.
-const backendApiUrlsInDev = {
- local: 'http://127.0.0.1:8000/api/v1',
- remote: 'http://127.0.0.1:8000/api/v1',
- // remote: 'https://framadate-api.cipherbliss.com/api/v1',
-};
-const apiV1 = {
- baseHref: 'http://127.0.0.1:8000/api/v1',
- // baseHref: 'https://framadate-api.cipherbliss.com/api/v1',
- api_new_poll: '/poll/',
- api_get_poll: '/poll/{id}',
- api_new_vote_stack: '/poll/{id}/answer',
- 'api_test-mail-poll': '/api/v1/poll/mail/test-mail-poll/{emailChoice}',
- 'app.swagger': '/api/doc.json',
-};
+import { endpoints } from './endpoints';
+import { poll_conf } from './poll_conf';
export const environment = {
- frontDomain: 'http://127.0.0.1:8000',
+ frontDomain: 'http://127.0.0.1:4200',
production: false,
- display_routes: false,
+ display_routes: true,
autofill: true,
showDemoWarning: false,
autoSendNewPoll: false,
interval_days_default: 7,
- appTitle: 'FramaDate Funky',
- appVersion: '2.1.0',
+ appTitle: 'FDFunky',
+ appVersion: '0.6.0',
appLogo: 'assets/img/logo.png',
- api: {
- versionToUse: 'apiV1',
- version: {
- apiV1,
- },
- baseHref: backendApiUrlsInDev.local,
- endpoints: {
- polls: {
- name: '/poll',
- choices: {
- name: '/choices',
- },
- comments: {
- name: '/comments',
- },
- slugs: {
- name: '/slugs',
- },
- answers: {
- name: '/answers',
- },
- },
- users: {
- name: '/users',
- polls: {
- name: '/polls',
- sendEmail: {
- name: '/send-email',
- },
- },
- },
- },
- },
- poll: {
- defaultConfig: {
- maxCountOfAnswers: 150,
- expiresDaysDelay: 60,
- expiracyAfterLastModificationInDays: 180,
- whoCanChangeAnswers: 'everybody',
- visibility: 'link_only',
- voteChoices: 'only_yes',
- },
- },
+ api: endpoints,
+ poll: poll_conf,
localStorage: {
- key: 'FramaSondage',
+ key: 'FramaDateFunky',
},
};
@@ -83,4 +30,5 @@ export const environment = {
* This import should be commented out in production mode because it will have a negative impact
* on performance if an error is thrown.
*/
-import 'zone.js/dist/zone-error'; // Included with Angular CLI.
+import 'zone.js/dist/zone-error';
+// Included with Angular CLI.
diff --git a/src/environments/poll_conf.ts b/src/environments/poll_conf.ts
new file mode 100644
index 00000000..ac475cfd
--- /dev/null
+++ b/src/environments/poll_conf.ts
@@ -0,0 +1,10 @@
+export const poll_conf = {
+ defaultConfig: {
+ maxCountOfAnswers: 150,
+ expiresDaysDelay: 60,
+ expiracyAfterLastModificationInDays: 180,
+ whoCanChangeAnswers: 'everybody',
+ visibility: 'link_only',
+ voteChoices: 'only_yes',
+ },
+};
diff --git a/src/styles/libraries/_overrides.scss b/src/styles/libraries/_overrides.scss
index 12c528d7..3218657a 100644
--- a/src/styles/libraries/_overrides.scss
+++ b/src/styles/libraries/_overrides.scss
@@ -15,3 +15,7 @@ $input-shadow: none;
.notification {
margin: 1em 0;
}
+.select {
+ display: block !important;
+ width: 80%;
+}
diff --git a/src/styles/partials/_forms.scss b/src/styles/partials/_forms.scss
index fbafaa39..bd3e0ff8 100644
--- a/src/styles/partials/_forms.scss
+++ b/src/styles/partials/_forms.scss
@@ -207,7 +207,7 @@ mat-checkbox {
}
.ng-pristine,
.ng-dirty {
- border-left: blue 3px solid;
+ //border-left: #ccc 3px solid;
padding-left: 1em;
}
.ng-touched.ng-invalid {
diff --git a/src/styles/partials/_responsive.scss b/src/styles/partials/_responsive.scss
index be856ee5..db77fe87 100644
--- a/src/styles/partials/_responsive.scss
+++ b/src/styles/partials/_responsive.scss
@@ -6,7 +6,7 @@
width: 45%;
}
.date-choice > input:first-of-type {
- width: 80%;
+ width: 75%;
}
.date-choice .btn--primary,
.several-times {
@@ -15,7 +15,7 @@
}
.time-choice {
input {
- width: 70%;
+ width: 80%;
}
}
}