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.

Sign up for GitHub

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

Jump to bottom

Dev #2

Open
wants to merge 47 commits into
base: main
Choose a base branch
from
Open

Dev #2

wants to merge 47 commits into from

Conversation

faisalEsMagico
Copy link
Collaborator

Description & Technical Solution

Describe problems, if any, clearly and concisely.
Summarize the impact to the system.
Please also include relevant motivation and context.
Please include a summary of the technical solution and how it solves the problem.

Checklist

  • I have commented my code, particularly in hard-to-understand areas.
  • Already rebased against main branch.

Screenshots

Provide screenshots or videos of the changes made if any.

Ankit1ml and others added 30 commits October 27, 2023 09:59
@Ankit1ml
feat(marketplace-ui): only ui part is completed
12af1c1
@Ankit1ml
feat(marketplace-ui): onclick and some modification
8a3c0d8
@Ankit1ml
feat(marketplace ui): testing using dummy deta
a657429
@ankitmlesmagico
feat(final update): final touchup
63aae1e
@ankitmlesmagico
feat(final update): final touchup
fdb89c0
@ankitmlesmagico
feat(notification): integration with backend
2778297
@ankitmlesmagico
feat(purchase history): integration with backend
4ee95be
@ankitmlesmagico
feat(course): integration
04fd35a
@ankitmlesmagico
feat(searchBar and filter): integration
72d9d67
@ankitmlesmagico
feat(searchBar and filter): remove duration
a65b38e
@faisalEsMagico
fix(svg): import NOTFOUND svg
0028be4
@ankitmlesmagico
feat(marktetplace): save status
4df7a75
@ankitmlesmagico
Merge branch 'dev' of https://github.com/COMPASS-DPG/marketplace-ui i…
0936a65 
…nto dev
@faisalEsMagico
feat(redux): redux
ac5a2f7
@faisalEsMagico
feat(redux): done with single course
4d3fae1
@faisalEsMagico
feat(context): remove context api logic
a1d5384
@faisalEsMagico
feat(ui): done with ui changes
779fce3
@ankitmlesmagico
feat(marktetplace): updates
b62acc9
@ankitmlesmagico
feat(marktetplace): merge
0e07530
@faisalEsMagico
feat(ui): changes in ui
69a2f1d
@faisalEsMagico
feat(error): added no course found screen
6d3a291
@faisalEsMagico
feat(puchase): added credit in confirm popup
80acf3d
@faisalEsMagico
feat(integration): integrate search
49592a0
@faisalEsMagico
feat(redux): persist data in local storage
9af32ac
@faisalEsMagico
feat(changes): done with changes
b14b75d
@faisalEsMagico
feat(integration): done integrationn
f183b62
@faisalEsMagico
feat(changes): done changes
a03d377
feat(config): config file for urls
0d29721
@faisalEsMagico
feat(courseLink): handle logic for course Link
9e3bb9e
@faisalEsMagico
Merge branch 'feature/redux' of https://github.com/COMPASS-DPG/market…
421a973 
…place-ui into feature/redux
faisalEsMagico and others added 17 commits December 13, 2023 16:16
@faisalEsMagico
feat(comment): remove comment
4da0537
@faisalEsMagico
feat(polling): change logic for polling course
ee2ba06
@faisalEsMagico
feat(input): fix margin in search input
a8964bb
@faisalEsMagico
feat(merge): merge branch
225641b
@faisalEsMagico
Merge pull request #1 from COMPASS-DPG/feature/redux
e3dc695 
Feature/redux
feat(DockerFile): updated Docker file
e452478
@faisalEsMagico
feat(poll): done with polling courses + most popular course
f9ed320
@faisalEsMagico
Merge branch 'dev' of https://github.com/COMPASS-DPG/marketplace-ui i…
146b53a 
…nto dev
@faisalEsMagico
feat(build): done changes for build
1b9ab13
@faisalEsMagico
feat(rating): handle null rating
37239e6
@faisalEsMagico
fix(error): fix redux persist error
bc3fff7
@faisalEsMagico
feat(changes): metaData + error screen + user name
2065806
@faisalEsMagico
feat(changes): done changes
a5f7b09
@faisalEsMagico
fix(dataFormat): competency data format
5ae7366
@faisalEsMagico
fix(ongoingCourse): fix card height in slider
d79feb3
@faisalEsMagico
feat(filter): search course filter changes done
f273552
@kh4l1d64
Update .env.example
4e73a6f
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@faisalEsMagico @Ankit1ml @ankitmlesmagico @kh4l1d64