Merge pull request #3 from kreastol-club/dev

Version v0.3.0 changes

Author: joshika39

CHANGELOG.md

@@ -0,0 +1,16 @@
+# Changelog
+
+## Unreleased
+
+## v0.3.0
+### Added
+- Article component @joshika39 
+- Articles wrapper @joshika39 
+- Login button with dropdown to open settings @joshika39
+- Styles for clickable link in `Article` @joshika39
+
+### Fixed
+- Runtime version representation @joshika39
+
+### Changed
+- Navbar was reordered @joshika39

Dockerfile

@@ -1,18 +1,3 @@
-#FROM node:18
-#
-#ENV NEXTAUTH_URL=http://localhost:3000
-#ENV DATABASE_URL=postgresql://0.0.0.0:5432
-#WORKDIR /app
-#COPY package*.json ./
-#COPY prisma ./prisma/
-#RUN npm install
-#RUN npx prisma generate
-#COPY . .
-#RUN npm run build
-#EXPOSE 3000
-#CMD npm start
-
-
 FROM node:lts as dependencies
 WORKDIR /app
 COPY package.json ./
@@ -25,14 +10,14 @@ WORKDIR /app
 COPY . .
 COPY --from=dependencies /app/node_modules ./node_modules
 
-
 RUN npm run build
 
 FROM node:lts as runner
 WORKDIR /app
 ENV NODE_ENV production
 ENV BASE_URL=http://localhost:8887
 ENV NEXT_TELEMETRY_DISABLED 1
+COPY --from=dependencies /app/prisma ./prisma
 COPY --from=builder /app/next.config.js ./
 COPY --from=builder /app/*.ts ./
 COPY --from=builder /app/public ./public
@@ -41,5 +26,10 @@ COPY --from=builder /app/node_modules ./node_modules
 COPY --from=builder /app/dictionaries ./dictionaries
 COPY --from=builder /app/package.json ./package.json
 
+COPY entrypoint.sh ./entrypoint.sh
+RUN chmod +x ./entrypoint.sh
+
+ENTRYPOINT ["./entrypoint.sh"]
+
 EXPOSE 3000
-CMD ["npm", "start"]
+CMD ["npm", "start"]

app/[lang]/about/page.tsx

@@ -1,7 +1,6 @@
 import Card from "@/components/Card";
 import { Locale } from "@/i18n.config";
 import React from "react";
-import EventPaginator from "@/app/[lang]/events/components/Paginator";
 import { getDictionary } from "@/dictionaries";
 
 

app/[lang]/events/layout.tsx

@@ -5,10 +5,9 @@ import { Inter } from 'next/font/google'
 import React from "react";
 import { i18n, Locale } from "@/i18n.config";
 import getConfig from "next/config";
-import AuthProvider from "@/app/[lang]/context/AuthProvider";
-import UserCard from "@/components/UserCard";
 import { Badge } from '@/components/ui/badge';
 import { ThemeProvider } from '@/components/theme-provider';
+import AuthProvider from '@/context/AuthProvider';
 
 const inter = Inter({ subsets: ['latin'] })
 
@@ -22,7 +21,7 @@ export async function generateStaticParams() {
 }
 
 function envBadge() {
-  return process.env.NODE_ENV === 'production' ? "" : `${process.env.NODE_ENV} | `;
+  return process.env.RUNTIME === 'production' ? "" : `${process.env.RUNTIME} | `;
 }
 
 export default function RootLayout({ children, params }: {
@@ -41,13 +40,12 @@ export default function RootLayout({ children, params }: {
               <main className="w-full h-full overflow-y-auto">
                 {children}
               </main>
-              <footer className="footer footer-center gap-4 p-4 flex justify-evenly flex-row max-sm:flex-col">
-                <aside className='flex'>
-                  <p>Copyright © 2023 - Kreastol Klub Org.</p>
+              <footer className="gap-4 p-4 flex justify-evenly flex-col xs:flex-row">
+                <aside className='xs:w-fit w-full'>
+                  <p className='text-sm xs:text-left text-center'>Copyright © 2023 - Kreastol Klub Org.</p>
                 </aside>
-                <Badge>{envBadge()}kreastol-next@{publicRuntimeConfig.version}</Badge>
-                <div className='flex'>
-                  <UserCard />
+                <div className='flex xs:w-fit w-full h-fit self-center justify-center'>
+                  <Badge>{envBadge()}kreastol-next@{publicRuntimeConfig.version}</Badge>
                 </div>
               </footer>
             </AuthProvider>