From b828c6db9cc12b97cba319a8ea3d6014581c12af Mon Sep 17 00:00:00 2001
From: smugg99 <dudak799@gmail.com>
Date: Sun, 24 Nov 2024 21:25:21 +0100
Subject: [PATCH] removed env from dockerfile, fixed margin in resource page

---
 docker-compose.yml                            |  8 ++---
 dockerfile                                    |  4 +--
 .../src/components/pages/ResourcePage.vue     | 35 ++++++++++---------
 3 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 9a47a02..d41c646 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -32,9 +32,8 @@ services:
     networks:
       - app-network
     volumes:
-      - ./build/Goptivum/dist:/app/dist
-      - ./build/Goptivum/config.json:/app/config.json
-      - ./build/Goptivum/.env:/app/.env  
+      - ./build/Goptivum/.env:/app/.env
+      - goptivum_db:/app/db
 
   certbot:
     image: certbot/certbot
@@ -66,4 +65,5 @@ networks:
 
 volumes:
   certbot_etc:
-  certbot_var:
\ No newline at end of file
+  certbot_var:
+  goptivum_db:
\ No newline at end of file
diff --git a/dockerfile b/dockerfile
index 70e7ae2..39ad894 100644
--- a/dockerfile
+++ b/dockerfile
@@ -5,8 +5,7 @@ RUN apt-get update && apt-get install -y \
     git \
     make \
     nodejs \
-    npm \
-    ca-certificates
+    npm
 
 WORKDIR /app
 
@@ -23,7 +22,6 @@ WORKDIR /app
 
 COPY --from=builder /app/build/Goptivum/dist /app/dist
 COPY --from=builder /app/build/Goptivum/config.json /app/config.json
-COPY --from=builder /app/build/Goptivum/.env /app/.env
 COPY --from=builder /app/build/Goptivum/Goptivum /app/Goptivum
 
 RUN chmod +x /app/Goptivum
diff --git a/web/prod/src/components/pages/ResourcePage.vue b/web/prod/src/components/pages/ResourcePage.vue
index e5c859c..6d7ccb2 100644
--- a/web/prod/src/components/pages/ResourcePage.vue
+++ b/web/prod/src/components/pages/ResourcePage.vue
@@ -11,16 +11,15 @@
 
 		<component :is="gridWrapper">
 			<v-container class="scrollable-grid pa-0">
-				<v-container :key="searchKey" class="scrollable-grid pa-0">
-					<v-container class="resource-grid pa-0" :style="gridStyle">
-						<v-col v-for="(item, index) in filteredItems" :key="item.id" class="grid-item pa-0"
-							:class="{ 'animated-item': !reducedAnimationsEnabled }"
-							:style="!reducedAnimationsEnabled ? delayStyle(index) : {}">
-							<ResourceButton :text="item.full_name" :designator="item.designator" :index="index"
-								:id="item.id" :type="type" />
-						</v-col>
-					</v-container>
+				<v-container :key="searchKey" class="resource-grid pa-0" :style="gridStyle">
+					<v-col v-for="(item, index) in filteredItems" :key="item.id" class="grid-item pa-0"
+						:class="{ 'animated-item': !reducedAnimationsEnabled }"
+						:style="!reducedAnimationsEnabled ? delayStyle(index) : {}">
+						<ResourceButton :text="item.full_name" :designator="item.designator" :index="index"
+							:id="item.id" :type="type" />
+					</v-col>
 				</v-container>
+
 				<v-empty-state v-if="!loading && !error && filteredItems.length === 0"
 					:icon="`mdi-magnify-remove-outline`" class="no-resources" :title="t(`page.no_${type}s`)" />
 				<v-empty-state v-if="error" icon="mdi-alert-circle" color="error" class="no-resources"
@@ -81,13 +80,12 @@ window.addEventListener('resize', () => {
 });
 
 const gridStyle = computed(() => {
-	const minWidth = props.type === 'teacher' ? '12rem' : '6rem';
+	const minWidth = props.type === 'teacher' ? '10rem' : '6rem';
 	return {
 		display: 'grid',
-		gridTemplateColumns: isMobileView.value
-			? `repeat(auto-fit, minmax(${props.type === 'teacher' ? '8rem' : '6rem'}, 1fr))`
-			: `repeat(auto-fit, minmax(${minWidth}, 1fr))`,
+		gridTemplateColumns: `repeat(auto-fill, minmax(${minWidth}, 1fr))`,
 		gap: '16px',
+		justifyItems: 'center',
 	};
 });
 
@@ -136,6 +134,7 @@ watch(
 		search.value = '';
 		items.value = [];
 		error.value = null;
+		onClear();
 		fetchItems();
 	}
 );
@@ -185,15 +184,19 @@ onMounted(fetchItems);
 	align-items: center;
 }
 
+.scrollable-grid {
+	margin-bottom: 16px;
+}
+
 .resource-grid {
 	width: calc(100% - 32px);
-	margin: 0 16px 16px 16px;
+	margin: 0 auto;
 	box-sizing: border-box;
-	grid-template-columns: repeat(auto-fit, minmax(12rem, 1fr));
+	grid-template-columns: repeat(auto-fill, minmax(12rem, 1fr));
 	gap: 16px;
 
 	@media (max-width: 450px) {
-		grid-template-columns: repeat(auto-fit, minmax(8rem, 1fr));
+		grid-template-columns: repeat(auto-fill, minmax(8rem, 1fr));
 	}
 }