From 0a174a642c4792ab8d8f58d4dbcebad0aca1f24b Mon Sep 17 00:00:00 2001 From: Valeriya Ripyanchina Date: Wed, 26 May 2021 17:30:14 +0300 Subject: [PATCH 1/2] Added sayHi --- .idea/.gitignore | 8 ++++++++ .idea/jsbasic-20210520_vaya | 1 + .idea/modules.xml | 8 ++++++++ .idea/project.iml | 8 ++++++++ .idea/vcs.xml | 6 ++++++ my.html | 26 ++++++++++++++++++++++---- script.js | 20 ++++++++++++++++++++ 7 files changed, 73 insertions(+), 4 deletions(-) create mode 100644 .idea/.gitignore create mode 160000 .idea/jsbasic-20210520_vaya create mode 100644 .idea/modules.xml create mode 100644 .idea/project.iml create mode 100644 .idea/vcs.xml create mode 100644 script.js diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..73f69e0 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,8 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml +# Editor-based HTTP Client requests +/httpRequests/ diff --git a/.idea/jsbasic-20210520_vaya b/.idea/jsbasic-20210520_vaya new file mode 160000 index 0000000..8481dce --- /dev/null +++ b/.idea/jsbasic-20210520_vaya @@ -0,0 +1 @@ +Subproject commit 8481dce08927a7466e6cec459e7e1886043604d0 diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..a0733a5 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/project.iml b/.idea/project.iml new file mode 100644 index 0000000..c956989 --- /dev/null +++ b/.idea/project.iml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..94a25f7 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/my.html b/my.html index 0296029..7b875f1 100644 --- a/my.html +++ b/my.html @@ -1,7 +1,25 @@ - -Welcome to Git! + + + + + + + +

Решение первой задачи

+function sum1(a, b){ +return a + b; +} +console.log(sum1(1,1)); + +function sum2(c, d){ +return c + d; +} +console.log(sum2(2,5)); + + + + + -

Let's have some fun!

-

New changes!

diff --git a/script.js b/script.js new file mode 100644 index 0000000..3b97f67 --- /dev/null +++ b/script.js @@ -0,0 +1,20 @@ + + + + + + + +

Решение первой задачи

+function sum1(a, b){ +return a + b; +} +console.log(sum1(1,1)); + +function sum2(c, d){ +return c + d; +} +console.log(sum2(2,5)); + + + From 53fe41589ed209e5b0ca0adea5010907d1b11261 Mon Sep 17 00:00:00 2001 From: Valeriya Ripyanchina Date: Wed, 26 May 2021 18:55:37 +0300 Subject: [PATCH 2/2] commit --- .idea/jsbasic-20210520_vaya | 1 - script.js | 6 +++++- 2 files changed, 5 insertions(+), 2 deletions(-) delete mode 160000 .idea/jsbasic-20210520_vaya diff --git a/.idea/jsbasic-20210520_vaya b/.idea/jsbasic-20210520_vaya deleted file mode 160000 index 8481dce..0000000 --- a/.idea/jsbasic-20210520_vaya +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 8481dce08927a7466e6cec459e7e1886043604d0 diff --git a/script.js b/script.js index 3b97f67..a9afd46 100644 --- a/script.js +++ b/script.js @@ -5,7 +5,7 @@ -

Решение первой задачи

+

Решение первой задачи

function sum1(a, b){ return a + b; } @@ -15,6 +15,10 @@ function sum2(c, d){ return c + d; } console.log(sum2(2,5)); + +

Решение первой задачи

+ +