redesign

tkosminov · Aug 5, 2024 · 809f7ab · 809f7ab
1 parent 17bafa6
commit 809f7ab
Show file tree

Hide file tree

Showing 51 changed files with 933 additions and 869 deletions.
diff --git a/back/src/models/task/task.service.ts b/back/src/models/task/task.service.ts
@@ -123,7 +123,7 @@ export class TaskService {
       }
 
       acc[key].count++;
-      acc[key].percent = Number(((acc[key].count / count) * 100).toFixed(1));
+      acc[key].percent = Number((acc[key].count / count).toFixed(1));
 
       return acc;
     }, {});

diff --git a/front/package-lock.json b/front/package-lock.json
diff --git a/front/package.json b/front/package.json
@@ -15,19 +15,19 @@
     "codegen:generate": "graphql-codegen --config codegen.yml"
   },
   "dependencies": {
+    "@mdi/font": "^7.4.47",
     "@vue/apollo-composable": "^4.0.0",
     "axios": "^1.6.2",
-    "bootstrap": "^5.3.3",
-    "bootstrap-icons": "^1.11.3",
-    "floating-vue": "^5.2.2",
+    "charts.css": "^1.1.0",
     "graphql-ws": "^5.14.3",
     "jwt-decode": "^4.0.0",
     "pinia": "^2.1.7",
     "rxjs": "^7.8.1",
     "vue": "^3.3.11",
     "vue-i18n": "^9.13.1",
     "vue-router": "^4.2.5",
-    "vue-toastification": "^2.0.0-rc.5"
+    "vue-toastification": "^2.0.0-rc.5",
+    "vuetify": "^3.6.13"
   },
   "devDependencies": {
     "@graphql-codegen/cli": "5.0.0",
@@ -37,7 +37,6 @@
     "@graphql-codegen/typescript-document-nodes": "^4.0.1",
     "@graphql-codegen/typescript-operations": "^4.0.1",
     "@rushstack/eslint-patch": "^1.6.1",
-    "@types/bootstrap": "^5.2.10",
     "@types/node": "^20.10.5",
     "@vitejs/plugin-vue": "^4.5.2",
     "@vue/eslint-config-prettier": "^8.0.0",

diff --git a/front/src/app/App.vue b/front/src/app/App.vue
@@ -1,11 +1,17 @@
 <template>
-  <NavbarWidget />
+  <v-layout>
+    <NavbarWidget />
 
-  <div class="container mt-6">
-    <CBreadcrumb />
+    <v-container class="mt-6">
+      <v-row>
+        <CBreadcrumb />
+      </v-row>
 
-    <RouterView />
-  </div>
+      <v-row>
+        <RouterView />
+      </v-row>
+    </v-container>
+  </v-layout>
 </template>
 
 <script setup lang="ts">

diff --git a/front/src/app/index.ts b/front/src/app/index.ts
@@ -9,15 +9,15 @@ import {
   apollo_client,
   DefaultApolloClient,
   provideApolloClients,
-  FloatingVue,
   toast,
   i18n,
+  vuetify,
 } from './providers';
 
 provideApolloClients({ default: apollo_client });
 app.provide(DefaultApolloClient, apollo_client);
 app.use(router);
 app.use(store);
-app.use(FloatingVue);
 app.use(toast.plugin, toast.settings);
 app.use(i18n);
+app.use(vuetify);
diff --git a/front/src/app/providers/bootstrap/index.ts b/front/src/app/providers/bootstrap/index.ts
diff --git a/front/src/app/providers/floating/index.ts b/front/src/app/providers/floating/index.ts
diff --git a/front/src/app/providers/i18n/en.ts b/front/src/app/providers/i18n/en.ts
@@ -3,7 +3,6 @@ export const en = {
     room: {
       users_list: 'Users',
       current_task: 'Current task',
-      tasks_list: 'Tasks',
     },
     rooms: {
       title: 'Rooms',
@@ -15,12 +14,19 @@ export const en = {
   },
   widgets: {
     task: {
+      list: {
+        tasks_list: 'Tasks',
+      },
       card: {
         rounded_value: 'Rounded value',
       },
       current: {
         voting: 'Voting',
         voting_result: 'Voting results',
+      },
+    },
+    vote: {
+      result: {
         average_value: 'Average value',
         rounded_value: 'Rounded value',
       },
@@ -56,6 +62,7 @@ export const en = {
       },
     },
     sign_in: {
+      title: 'Sign In',
       full_name: 'Username',
       enter_full_name: 'Enter username',
       sign_in: 'Sign In',