Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dev #2

Open
wants to merge 47 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
12af1c1
feat(marketplace-ui): only ui part is completed
Ankit1ml Oct 27, 2023
8a3c0d8
feat(marketplace-ui): onclick and some modification
Ankit1ml Oct 29, 2023
a657429
feat(marketplace ui): testing using dummy deta
Ankit1ml Oct 31, 2023
63aae1e
feat(final update): final touchup
ankitmlesmagico Nov 21, 2023
fdb89c0
feat(final update): final touchup
ankitmlesmagico Nov 21, 2023
2778297
feat(notification): integration with backend
ankitmlesmagico Nov 23, 2023
4ee95be
feat(purchase history): integration with backend
ankitmlesmagico Nov 23, 2023
04fd35a
feat(course): integration
ankitmlesmagico Nov 25, 2023
72d9d67
feat(searchBar and filter): integration
ankitmlesmagico Nov 30, 2023
a65b38e
feat(searchBar and filter): remove duration
ankitmlesmagico Nov 30, 2023
0028be4
fix(svg): import NOTFOUND svg
faisalEsMagico Nov 30, 2023
4df7a75
feat(marktetplace): save status
ankitmlesmagico Dec 1, 2023
0936a65
Merge branch 'dev' of https://github.com/COMPASS-DPG/marketplace-ui i…
ankitmlesmagico Dec 1, 2023
ac5a2f7
feat(redux): redux
faisalEsMagico Dec 1, 2023
4d3fae1
feat(redux): done with single course
faisalEsMagico Dec 3, 2023
a1d5384
feat(context): remove context api logic
faisalEsMagico Dec 3, 2023
779fce3
feat(ui): done with ui changes
faisalEsMagico Dec 3, 2023
b62acc9
feat(marktetplace): updates
ankitmlesmagico Dec 3, 2023
0e07530
feat(marktetplace): merge
ankitmlesmagico Dec 3, 2023
69a2f1d
feat(ui): changes in ui
faisalEsMagico Dec 4, 2023
6d3a291
feat(error): added no course found screen
faisalEsMagico Dec 4, 2023
80acf3d
feat(puchase): added credit in confirm popup
faisalEsMagico Dec 4, 2023
49592a0
feat(integration): integrate search
faisalEsMagico Dec 5, 2023
9af32ac
feat(redux): persist data in local storage
faisalEsMagico Dec 10, 2023
b14b75d
feat(changes): done with changes
faisalEsMagico Dec 11, 2023
f183b62
feat(integration): done integrationn
faisalEsMagico Dec 11, 2023
a03d377
feat(changes): done changes
faisalEsMagico Dec 13, 2023
0d29721
feat(config): config file for urls
Dec 13, 2023
9e3bb9e
feat(courseLink): handle logic for course Link
faisalEsMagico Dec 13, 2023
421a973
Merge branch 'feature/redux' of https://github.com/COMPASS-DPG/market…
faisalEsMagico Dec 13, 2023
4da0537
feat(comment): remove comment
faisalEsMagico Dec 13, 2023
ee2ba06
feat(polling): change logic for polling course
faisalEsMagico Dec 13, 2023
a8964bb
feat(input): fix margin in search input
faisalEsMagico Dec 13, 2023
225641b
feat(merge): merge branch
faisalEsMagico Dec 13, 2023
e3dc695
Merge pull request #1 from COMPASS-DPG/feature/redux
faisalEsMagico Dec 13, 2023
e452478
feat(DockerFile): updated Docker file
Dec 13, 2023
f9ed320
feat(poll): done with polling courses + most popular course
faisalEsMagico Dec 14, 2023
146b53a
Merge branch 'dev' of https://github.com/COMPASS-DPG/marketplace-ui i…
faisalEsMagico Dec 14, 2023
1b9ab13
feat(build): done changes for build
faisalEsMagico Dec 14, 2023
37239e6
feat(rating): handle null rating
faisalEsMagico Dec 15, 2023
bc3fff7
fix(error): fix redux persist error
faisalEsMagico Dec 15, 2023
2065806
feat(changes): metaData + error screen + user name
faisalEsMagico Dec 15, 2023
a5f7b09
feat(changes): done changes
faisalEsMagico Dec 15, 2023
5ae7366
fix(dataFormat): competency data format
faisalEsMagico Dec 18, 2023
d79feb3
fix(ongoingCourse): fix card height in slider
faisalEsMagico Dec 19, 2023
f273552
feat(filter): search course filter changes done
faisalEsMagico Dec 19, 2023
4e73a6f
Update .env.example
kh4l1d64 Apr 17, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,6 @@
# DEVELOPMENT TOOLS
# Ideally, don't add them to production deployment envs
# !STARTERCONF Change to true if you want to log data
NEXT_PUBLIC_SHOW_LOGGER="false"
NEXT_PUBLIC_SHOW_LOGGER="false"
PORT=
NEXT_PUBLIC_MARKETPLACE_BACKEND_URL='http://localhost:4020'
2 changes: 1 addition & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"editor.formatOnSave": true,
"editor.tabSize": 2,
"editor.codeActionsOnSave": {
"source.fixAll": true
"source.fixAll": "explicit"
},
// Tailwind CSS Autocomplete, add more if used in projects
"tailwindCSS.classAttributes": [
Expand Down
40 changes: 40 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
# Stage 1: Build Stage
FROM node:18-alpine AS build

# Set the working directory inside the container
WORKDIR /app

# Copy package.json and package-lock.json to the working directory
COPY package*.json ./

# Install dependencies
RUN npm install

# Copy the rest of the application code to the container
COPY . .
COPY .env.example ./env.local

# Build the Next.js app
RUN npm run build

# Stage 2: Runtime Stage
FROM node:18-alpine

# Set the working directory inside the container
WORKDIR /app

# Copy only necessary files from the build stage
ENV NODE_ENV production

COPY --from=build /app/next.config.js ./next.config.js
COPY --from=build /app/public ./public
COPY --from=build /app/package.json ./package.json
COPY --from=build /app/.next/standalone ./
COPY --from=build /app/.next/static ./.next/static
COPY .env.example ./env.local

# Expose the desired port
EXPOSE 3400

# Start the Next.js app
CMD ["node", "server.js"]
6 changes: 6 additions & 0 deletions config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
const marketBackendUrl =
process.env.NEXT_PUBLIC_MARKETPLACE_BACKEND_URL || 'http://localhost:4020';

module.exports = {
marketBackendUrl,
};
15 changes: 15 additions & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
version: '3'

services:
marketplace-ui:
build:
context: .
dockerfile: Dockerfile
ports:
- "3400:3000"
networks:
- samagra_compass

networks:
samagra_compass:
external: true
15 changes: 9 additions & 6 deletions next.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,16 @@ const nextConfig = {

reactStrictMode: true,
swcMinify: true,

output: 'standalone',
// Uncoment to add domain whitelist
// images: {
// domains: [
// 'res.cloudinary.com',
// ],
// },
images: {
remotePatterns: [
{
protocol: 'https',
hostname: '**',
},
],
},

webpack(config) {
// Grab the existing rule that handles SVG imports
Expand Down
Loading
Loading