Skip to content

Commit c0e0f3e

Browse files
devvsakibdevvsakib
committed
Main Branch Merge Success
2 parents cbdcbf8 + 05ec71b commit c0e0f3e

70 files changed

Lines changed: 1873 additions & 0 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎main/ReadMe.md‎

Whitespace-only changes.

‎main/app.js‎

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
// let word = "word"
2+
// console.log(word.length);
3+
// for (let i = (word.length - 1); i >=0; i--){
4+
// console.log("Position: "+ i + ":");
5+
// console.log("char - " + word.charAt(i))
6+
// }
7+
8+
let vegetables = ["carrot", "tomato", "cucumber"]
9+
// console.log(vegetables.length);
10+
let vegetable
11+
let book = {
12+
title: "Neverending story",
13+
author: "John Smith",
14+
pages: 100
15+
}
16+
// console.log(book["title"]);
17+
// Given array [1,2,3,4,5,6,7,8,9,10,11,12] make it [0,0,0,0,1,1,1,1,0,0,0,0]
18+
//JavaSrcipt INTERMEDIATE PROBLEM
19+
let given_array = [1,2,3,4,5,6,7,8,9,10,11,12]
20+
let modi_array = []
21+
22+
for ( let i = 0; i < given_array.length; i++){
23+
if (i < 4 || i > 7){
24+
l = given_array[i]
25+
l = 0
26+
modi_array.push(l)
27+
}
28+
else{
29+
l = given_array[i]
30+
l = 1
31+
modi_array.push(l)
32+
}
33+
}
34+
// console.log(modi_array);
35+
36+
/*
37+
Write a function frequencies(arr) that takes in the string:
38+
"lkazjsdfnvapsifdophoidhjsadlkfjgbplak" and return a hash table containing all the different characters in it as the keys, and the number of times each character is repeated as the values
39+
40+
Example:
41+
42+
input: "lkazjsdfnvapsifdophoidhjsadlkfjgbplak"
43+
44+
output:
45+
{"l":3,"k":3,"a":4,"z":1,"j":3,"s":3,"d":4,"f":3,"n":1,"v":1,"p":3,"i":2,"o":2,"h":2,”g”:1,”b”:1};
46+
*/
47+
// Solutions ->
48+
const given_string = "lkazjsdfnvapsifdophoidhjsadlkfjgbplak"
49+
const modi_obj = {}
50+
51+
for ( let i = 0; i < given_string.length; i++){
52+
if ( !modi_obj[given_string[i]]){
53+
modi_obj[given_string[i]] = 1
54+
// console.log(modi_obj[given_string[i]]);
55+
}
56+
else{
57+
// console.log(modi_obj[given_string[i]]);
58+
// if the value is there, just add 1
59+
modi_obj[given_string[i]] += 1
60+
}
61+
}
62+
console.log(modi_obj)
63+
for ( let element in modi_obj){
64+
// ieterate the object
65+
// console.log(element)
66+
}
67+
68+
69+
70+
71+
// this is JsAlgo branch
72+
// d800fa5ee24c8e0072fe4d7c0

‎main/index.html‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
<!DOCTYPE html>
2+
<html lang="en">
3+
<head>
4+
<meta charset="UTF-8">
5+
<meta name="viewport" content="width=device-width, initial-scale=1.0">
6+
<title>Product Page Design</title>
7+
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/5.0.0-alpha1/css/bootstrap.min.css" integrity="sha384-r4NyP46KrjDleawBgD5tp8Y7UzmLA05oM1iAEQ17CSuDqnUK2+k9luXQOfXJCJ4I" crossorigin="anonymous">
8+
<script src="https://cdn.jsdelivr.net/npm/popper.js@1.16.0/dist/umd/popper.min.js" integrity="sha384-Q6E9RHvbIyZFJoft+2mJbHaEWldlvI9IOYy5n3zV9zzTtmI3UksdQRVvoxMfooAo" crossorigin="anonymous"></script>
9+
<script src="https://stackpath.bootstrapcdn.com/bootstrap/5.0.0-alpha1/js/bootstrap.min.js" integrity="sha384-oesi62hOLfzrys4LxRF63OJCXdXDipiYWBnvTl9Y9/TRlw5xlKIEHpNyvvDShgf/" crossorigin="anonymous"></script>
10+
<link rel="stylesheet" href="style.css">
11+
</head>
12+
<body>
13+
14+
15+
16+
17+
18+
19+
20+
</body>
21+
</html>

‎main/read.me‎

Whitespace-only changes.

‎main/tempCodeRunnerFile.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
iven_string[i]

‎main/test/file.md‎

Whitespace-only changes.

‎productpage/index.html‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
<meta name="viewport" content="width=device-width, initial-scale=1.0">
77
<title>Product Page Design</title>
88
<link rel="shortcut icon" href="images/favicon-32x32.png" type="image/x-icon">
9+
<<<<<<< HEAD
910
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/5.0.0-alpha1/css/bootstrap.min.css"
1011
integrity="sha384-r4NyP46KrjDleawBgD5tp8Y7UzmLA05oM1iAEQ17CSuDqnUK2+k9luXQOfXJCJ4I" crossorigin="anonymous">
1112
<script src="https://cdn.jsdelivr.net/npm/popper.js@1.16.0/dist/umd/popper.min.js"
@@ -19,14 +20,24 @@
1920
rel="stylesheet">
2021
<link rel="preconnect" href="https://fonts.googleapis.com">
2122
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
23+
=======
24+
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/5.0.0-alpha1/css/bootstrap.min.css" integrity="sha384-r4NyP46KrjDleawBgD5tp8Y7UzmLA05oM1iAEQ17CSuDqnUK2+k9luXQOfXJCJ4I" crossorigin="anonymous">
25+
<script src="https://cdn.jsdelivr.net/npm/popper.js@1.16.0/dist/umd/popper.min.js" integrity="sha384-Q6E9RHvbIyZFJoft+2mJbHaEWldlvI9IOYy5n3zV9zzTtmI3UksdQRVvoxMfooAo" crossorigin="anonymous"></script>
26+
<script src="https://stackpath.bootstrapcdn.com/bootstrap/5.0.0-alpha1/js/bootstrap.min.js" integrity="sha384-oesi62hOLfzrys4LxRF63OJCXdXDipiYWBnvTl9Y9/TRlw5xlKIEHpNyvvDShgf/" crossorigin="anonymous"></script><link href="https://fonts.googleapis.com/css2?family=Fraunces:opsz,wght@9..144,700&family=Montserrat:wght@500;700&display=swap" rel="stylesheet"> <link rel="preconnect" href="https://fonts.googleapis.com">
27+
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
28+
>>>>>>> main
2229
<link rel="stylesheet" href="style.css">
2330
</head>
2431

2532
<body>
33+
<<<<<<< HEAD
2634
<div class="topHeader">
2735
<h3>Frontend Web Developer</h3>
2836
<span>~ DevvSakib</span>
2937
</div>
38+
=======
39+
40+
>>>>>>> main
3041
<section class="container-fluid">
3142
<div class="mainContainer">
3243
<div class="leftcontainer">
@@ -36,19 +47,27 @@ <h3>Frontend Web Developer</h3>
3647
<div class="rightcontainer">
3748
<p>perfume</p>
3849
<h2>Gabrielle Essence Eau De Perfum</h2>
50+
<<<<<<< HEAD
3951
<p>A floral, solar and voluptous interpretation composed by Olivier POlge, Perfumer-Creattor for the House of
4052
CHANEL.</p>
53+
=======
54+
<p>A floral, solar and voluptous interpretation composed by Olivier POlge, Perfumer-Creattor for the House of CHANEL.</p>
55+
>>>>>>> main
4156
<div class="price">
4257
<h2>$149.99</h2>
4358
<span>$169.99</span>
4459
</div>
4560
<button class="cart">Add to Cart</button>
4661
</div>
62+
<<<<<<< HEAD
4763
<svg width="15" height="16" xmlns="http://www.w3.org/2000/svg">
4864
<path
4965
d="M14.383 10.388a2.397 2.397 0 0 0-1.518-2.222l1.494-5.593a.8.8 0 0 0-.144-.695.8.8 0 0 0-.631-.28H2.637L2.373.591A.8.8 0 0 0 1.598 0H0v1.598h.983l1.982 7.4a.8.8 0 0 0 .799.59h8.222a.8.8 0 0 1 0 1.599H1.598a.8.8 0 1 0 0 1.598h.943a2.397 2.397 0 1 0 4.507 0h1.885a2.397 2.397 0 1 0 4.331-.376 2.397 2.397 0 0 0 1.12-2.021ZM11.26 7.99H4.395L3.068 3.196h9.477L11.26 7.991Zm-6.465 6.392a.8.8 0 1 1 0-1.598.8.8 0 0 1 0 1.598Zm6.393 0a.8.8 0 1 1 0-1.598.8.8 0 0 1 0 1.598Z"
5066
fill="#FFF" />
5167
</svg>
68+
=======
69+
<svg width="15" height="16" xmlns="http://www.w3.org/2000/svg"><path d="M14.383 10.388a2.397 2.397 0 0 0-1.518-2.222l1.494-5.593a.8.8 0 0 0-.144-.695.8.8 0 0 0-.631-.28H2.637L2.373.591A.8.8 0 0 0 1.598 0H0v1.598h.983l1.982 7.4a.8.8 0 0 0 .799.59h8.222a.8.8 0 0 1 0 1.599H1.598a.8.8 0 1 0 0 1.598h.943a2.397 2.397 0 1 0 4.507 0h1.885a2.397 2.397 0 1 0 4.331-.376 2.397 2.397 0 0 0 1.12-2.021ZM11.26 7.99H4.395L3.068 3.196h9.477L11.26 7.991Zm-6.465 6.392a.8.8 0 1 1 0-1.598.8.8 0 0 1 0 1.598Zm6.393 0a.8.8 0 1 1 0-1.598.8.8 0 0 1 0 1.598Z" fill="#FFF"/></svg>
70+
>>>>>>> main
5271

5372
</div>
5473
</section>

‎productpage/style.css‎

Lines changed: 166 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
<<<<<<< HEAD
12
img {
23
max-width: 100%;
34
}
@@ -350,4 +351,169 @@ Responsive for mobile
350351
.rightcontainer .cart {
351352
margin-top: 20px;
352353
}
354+
=======
355+
img {
356+
max-width: 100%;
357+
}
358+
359+
p {
360+
font-size: 14px;
361+
font-family: 'Montserrat';
362+
font-weight: 500;
363+
color: hsl(228, 12%, 48%);
364+
365+
}
366+
367+
body {
368+
background: hsl(30, 38%, 92%);
369+
}
370+
371+
.container-fluid {
372+
width: 1440px;
373+
}
374+
375+
.mainContainer {
376+
width: 600px;
377+
height: 450px;
378+
margin: auto;
379+
display: flex;
380+
align-items: center;
381+
margin-top: 100px;
382+
border-radius: 10px;
383+
background: hsl(0, 0%, 100%);
384+
}
385+
386+
.leftcontainer {
387+
width: 50%;
388+
}
389+
390+
.rightcontainer p:first-child {
391+
text-transform: uppercase;
392+
letter-spacing: 5px;
393+
font-weight: 500;
394+
color: hsl(228, 12%, 48%);
395+
}
396+
397+
.leftcontainer img {
398+
height: 450px;
399+
/* width: 50%; */
400+
border-radius: 10px 0 0 10px;
401+
}
402+
403+
.hideMobile {
404+
display: none;
405+
}
406+
407+
.rightcontainer {
408+
width: 50%;
409+
padding: 0 35px;
410+
}
411+
412+
.rightcontainer h2 {
413+
font-family: 'Fraunces';
414+
font-weight: 700;
415+
}
416+
417+
.rightcontainer .price {
418+
display: flex;
419+
align-items: center;
420+
}
421+
422+
.rightcontainer .price h2 {
423+
font-family: 'Fraunces';
424+
font-weight: 700;
425+
display: inline;
426+
color: #3c8067;
427+
/* font-family: Montserrat; */
428+
font-family: Fraunces;
429+
}
430+
431+
.rightcontainer .price span {
432+
font-family: Montserrat;
433+
font-weight: 500;
434+
color: hsl(228, 12%, 48%);
435+
display: inline;
436+
text-decoration: line-through;
437+
margin-left: 10px;
438+
margin-top: -10px;
439+
font-size: 14px;
440+
}
441+
442+
.rightcontainer .cart {
443+
font-family: Montserrat;
444+
display: block;
445+
border: none;
446+
margin-top: 20px;
447+
padding: 10px 20px;
448+
font-weight: 500;
449+
color: hsl(0, 0%, 100%);
450+
background: #3c8067;
451+
border-radius: 10px;
452+
width: 100%;
453+
}
454+
455+
.rightcontainer .cart:hover {
456+
background: #184131;
457+
}
458+
459+
/*
460+
461+
Responsive for mobile
462+
463+
*/
464+
465+
@media (max-width: 375px) {
466+
.container-fluid {
467+
width: 320px;
468+
padding: 0;
469+
}
470+
471+
.mainContainer {
472+
width: 320px;
473+
height: auto;
474+
display: flex;
475+
flex-direction: column;
476+
overflow: hidden;
477+
}
478+
479+
img {
480+
display: none;
481+
}
482+
483+
.hideMobile {
484+
display: block;
485+
}
486+
487+
.leftcontainer {
488+
display: block;
489+
width: 100%;
490+
}
491+
492+
.leftcontainer img {
493+
height: 200px;
494+
width: 100%;
495+
border-radius: 0;
496+
}
497+
498+
.rightcontainer {
499+
width: 100%;
500+
padding: 20px 20px;
501+
}
502+
503+
.rightcontainer p:first-child {
504+
margin-bottom: 5px;
505+
}
506+
507+
.rightcontainer h2 {
508+
font-size: 30px;
509+
}
510+
511+
.rightcontainer .price h2 {
512+
font-size: 36px;
513+
}
514+
515+
.rightcontainer .cart {
516+
margin-top: 20px;
517+
}
518+
>>>>>>> main
353519
}

‎spacetourismwebsite/.gitignore‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# Avoid accidental upload of the Sketch and Figma design files
2+
#####################################################
3+
## Please do not remove lines 5 and 6 - thanks! 🙂 ##
4+
#####################################################
5+
*.sketch
6+
*.fig
7+
8+
# Avoid accidental XD upload if you convert the design file
9+
###############################################
10+
## Please do not remove line 12 - thanks! 🙂 ##
11+
###############################################
12+
*.xd
13+
14+
# Avoid your project being littered with annoying .DS_Store files!
15+
.DS_Store
16+
.prettierignore

0 commit comments

Comments
 (0)